8e273df5c5426ecb6743b9c6195964c264b68b33,kernel/kernel-impl/src/main/java/org/sakaiproject/email/impl/BasicEmailService.java,BasicEmailService,sendMail,#InternetAddress#InternetAddress[]#String#String#Map#InternetAddress[]#List#List#,295
Before Change
// the character set, for example, windows-1252 or UTF-8
String charset = extractCharset(contentTypeHeader);
if (charset != null && canUseCharset(content, charset))
{
// use the charset from the Content-Type header
}
else if (canUseCharset(content, CharacterSet.ISO_8859_1))
{
if (contentTypeHeader != null && charset != null)
contentTypeHeader = contentTypeHeader.replaceAll(charset, CharacterSet.ISO_8859_1);
else if (contentTypeHeader != null)
contentTypeHeader += "; charset=" + CharacterSet.ISO_8859_1;
charset = CharacterSet.ISO_8859_1;
}
else if (canUseCharset(content, CharacterSet.WINDOWS_1252))
{
if (contentTypeHeader != null && charset != null)
contentTypeHeader = contentTypeHeader.replaceAll(charset, CharacterSet.WINDOWS_1252);
else if (contentTypeHeader != null)
contentTypeHeader += "; charset=" + CharacterSet.WINDOWS_1252;
charset = CharacterSet.ISO_8859_1;
}
else
{
After Change
// the character set, for example, windows-1252 or UTF-8
String charset = extractCharset(contentTypeHeader);
if (charset != null && canUseCharset(content, charset) && canUseCharset(subject, charset))
{
// use the charset from the Content-Type header
}
else if (canUseCharset(content, CharacterSet.ISO_8859_1) && canUseCharset(subject, CharacterSet.ISO_8859_1))
{
if (contentTypeHeader != null && charset != null)
contentTypeHeader = contentTypeHeader.replaceAll(charset, CharacterSet.ISO_8859_1);